From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 3 Jan 2021 14:02:46 +0000 (+0000)
Subject: Merge version 2.4.1-1+rpi1 and 2.4.1-2 to produce 2.4.1-2+rpi1
X-Git-Tag: archive/raspbian/2.4.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a61f5bbd5c0a47bec00b9f6c739f4eeda5d88816;p=volk.git

Merge version 2.4.1-1+rpi1 and 2.4.1-2 to produce 2.4.1-2+rpi1
---

a61f5bbd5c0a47bec00b9f6c739f4eeda5d88816
diff --cc debian/changelog
index c800638,7c6bae6..58574f3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- volk (2.4.1-1+rpi1) bullseye-staging; urgency=medium
++volk (2.4.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
 +  * Disable neon.
 +
 +  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
 +  * Add bulid-depends-indep on texlive-latex-extra.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 11:52:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jan 2021 14:02:46 +0000
++
+ volk (2.4.1-2) unstable; urgency=medium
+ 
+   [ Shengjing Zhu ]
+   * Use system cpu_features package
+ 
+   [ A. Maitland Bottoms ]
+   * Adopt Use system cpu_features package patch (Closes: #978096)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 27 Dec 2020 15:16:07 -0500
  
  volk (2.4.1-1) unstable; urgency=medium
  
diff --cc debian/control
index 70e94f3,5bfb43a..94c0539
--- a/debian/control
+++ b/debian/control
@@@ -6,9 -6,10 +6,10 @@@ Build-Depends: cmake
                 debhelper-compat (= 13),
                 dh-python,
                 liborc-0.4-dev,
+                libcpu-features-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64 ppc64el],
  	       python3-dev,
  	       python3-mako
 -Build-Depends-Indep: doxygen, graphviz
 +Build-Depends-Indep: doxygen, graphviz, texlive-latex-extra,
  Standards-Version: 4.5.1
  Rules-Requires-Root: no
  Homepage: https://libvolk.org
diff --cc debian/patches/series
index cb87e71,ac0826c..672ebaf
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@ make-acc-happ
  optional-static-apps
  remove-external-HTML-resources
  skip-cpu_features-on-kfreebsd
+ use-system-cpu-features-package.patch
 +disable-neon